Updated for the new design