refactoring, added rest of data