Working on average response time
fixed merge conflict