Updated index controller