Changed back to older timing method.