Sounds like you have your final solution