Added response counter
Solved conflict