Pull Request Dev_1.0

Please separate functions at least 1 space apart po for readability