changes corresponding to FS changes Jan-Mar