Next time please do not add new feature when you do refactor.