Pedantry...updated