several intermediate changes
Added focusInitialItem
Codeoptimization