added better responses