Only added one feature while refactoring