tryting to fix indexing issue :/