Changes from design review