Regan and mike refactoring