working on syncing with master with proxy