Design changes (6/10 meeting)