implemented the new design