Minor changes for design review 2