added Intellidemand changes from Faux