More work on response return