Solved Index Problem for now