Commented out master negotiation code
merging with master