changes made directly on master