Changes from WC on 30 Sep
Added changes from FC on 30 Sep