updates after revert to 1fa5c39d77804156c0950aea3dffeb490ac8d567