Refactored old methods