removed references to MessageResponse to keep it simple