Roy's commit