Use refactored version of my code