Jeff - eliminate some duplications
Jeff - merge conflict