added commented-out old methods to refactor