Energy Flexibility from the Consumer: Integrating Local Electricity and Heat Supplies in a Building 1 Yang Zhang a,* , Pietro Elia Campana a,b , Ying Yang b , Bengt Stridh b , Anders Lundblad c , Jinyue Yan a,b,* a Division of Energy Processes, KTH-Royal Institute of Technology, SE-10044 Stockholm, Sweden b School of Business, Society & Engineering, Mälardalen University, SE-72123 Västerås, Sweden c Division of Safety and Transport/Electronics, RISE Research Institutes of Sweden, SE-50462 Borås, Sweden *Corresponding author: Yang Zhang & Jinyue Yan Mail address: Teknikringen 42, SE-100 44 Stockholm, Sweden Yang Zhang: yaz@kth.se Pietro Elia Campana: pietro.campana@mdh.se Ying Yang: ying.yang@mdh.se Bengt Stridh: bengt.stridh@mdh.se Anders Lundblad: anders.lundblad@ri.se Jinyue Yan: jinyue@kth.se 1 The short version of the paper was presented at ICAE2017 on August 21-24, Cardiff, UK. This paper is a substantial extension of the short version.