Recover some changes. Add Helpers.