WIP: design updates