+Add 2 cases and clean the index one