Added demand model stuff