A lot of shape improvements