Updated to use Mach timing