Sf/server edits