Client lag improvement