fIXED SOME SH....stuff