Fixed Index and Team

By jemi aymen