fixed a HUGE bug | have to go to bed