Rename method and move it out of the way