added timer conversion back in