Add Aric's contributions