#13 - Design Updates