commented out code to help refactor