Add class, comments on timings