Design

pull for o,u edits