Fixing index and changing to yi-ang