Updated SFM More