switched to new design