Avoid unscheduled calls for maximum productivity

Avoid unscheduled calls for maximum productivity