CN - Firther changes to timer interrupt handling