Updated to circuits 2.1.