implemeted new design