Timing Adjustments to decrease CPU usage
Merge branch 'cpu_usage'