Maybe i fixed something...and broke something else