Update to work on new dev environment