Updated for html response