moving design changes to design branch and reverting changes here