added Toaster stand-alone tracking