Working on the new design