Formula selection
minor changes