trying to revert to be the same as master, except for pertinent changes