Design changes after review