FIXED ERRYTHING