changed the acc timer to timer2
merged
merged'