WIP design updates