Moved timing into manager class