fix the index, moving to the real code