move transfer building to response object
merge and fix