iCommented out code to be refactored