fIXED SOME STUFF