fixed rain
trying to fix merge