Changes made from the response ui branch