Change of Bounding Boxes

Should fix some of the weird cases???
UNDO ANOTHER BAD FIX

REMOVING BREAK STATEMENTS IS BAD