Move code back into index
Move code back into index