Update: Severe thunderstorm watch affecting parts of Upstate NY until Sunday night