Works with the recent changes to IITC