slimming down the references, lots of editing