merge my index fix and lisa's fix