FIXED ALL ERRORS