Romesh's version of my code