Update responses.. almost finished