Revised shapes... again. Fixed width.