Alan's commit