more changes by master