need to address indexing problem