This looks like the most 'correct' solution, thanks.