Finished fixing!!!

Woohoo!! finally works!