Moved everything from Box to AABB