BUGS FIXED NOW YAYAYAYAY