#2 - Fixing the stuff that didnt work