my changes before merging Jeff's changes