Updating for the new layout