moved to request, tidied up response