more changes to Master