Homewrok done
Finished and fixed