response restructure - includes 2hotfixes