COMBINING SOLAR GENERATION ENERGY STORAGE AND