Modified SFM
litte fixes