Improves syntax, adds in some timing.