finish naming response to client
merge one