merged Michael's changes up to 4-8-14