Updated to accomodate dispatchable demand (internally at the EA we call this v1.4.1)