restruct and add response-connect