SF
minor changes