BUG FIX ~~ NEED UI FIX