Minor improvement, include client side slow down detection