edited changes for new design