check in before copying from Dr.Barney-Smith's changes