modified index & logic files