merged isaacs changes