revert and fixes