Changes to Design.cpp