master -chagned a few tings