Formatted code, added Savable field SFMs