THIS IS MY MORE OMPROVED VERSION BUT STILL NOT DONE :(