Changed protocol
merge