Changes for OF mode Soylent Independancy changes