Deductions & credits

@ColeenD3 thanks again for the response. In reading Residential Energy  ( Q#1 and Q#4) I have one more question can you please confirm credit for "residential energy property " for installation of solar equipment ( in my case i got this credit in 2016 amounting to 30% of my solar equipment )  is different than credit for improvements of "residential energy property " the one I am getting now ( for tankless water heater amounting to a credit of $150).?