more tuning on User waitFor