Changed index to be responsibe