sizing changes, right before merge with Max