Bram's commit