removed current timer stuff