little update on response handling