Renamed file
Improved code. Part 1