changed some breaks and stuff