Changes from Sheehan 2014-02-27