Changes from Navi.  Merge with Marvin.