Response not passed as parameter so added it in several places