Finished with correct solution