Update to new design