Changes for design review rd2