Added preliminary timing logic
merge fix.