Refactored code, introduced new features and bugs