Drop the shifting behavior for now
Fix the containment porportions