changed index and other stuff