Modifications for design review