Added proper throttle