to nathan: please revert me, or better me