refactor reply to correspond