sounds like a cleaner approach to me, modifying accordingly now ...