Changes from work on 2-19-13