changes following talks with Nick D