rebuilt with the updated layout