some changed to local master