added new indexes, correct question + toggle