Better management of response
Fixed conflicts