partial revert2 of the update