Added new level and refactored code