Changed index to match better needs, Changed Features on other ideas