New timer class
fixed merge conflicts