Updating for the new design