SOLAR PLUS STORAGE IN A COMPREHENSIVE