Updated Design and Develop