Updated to use Timer2

These changes have not been tested yet