Changes from 10/10 design review