refactored ICCTA changes