FIXED BUGS WOOOOOOO