Improved timer handling. More stable, more reliable