Adding on to this, the best test of whether your problem is hardware or software is to do a system refresh, do all Windows updates, and then don't install anything and see how long the battery lasts (or whether whatever problem you had disappears). If the problem is still there, it's probably a...