[Task1] A lot of changes and refactoring