upgraded the design schema