Added NonLinearIndex
Format changes (spaces)