Use new pattern
timer functional is done
Some modified