Edited to combine clock and Speedfactor
Merge branch 'master' into landonMOE
reconciled changes with master