Dev

some tasks were made