I have the same issue with the battery dying, but what I do is I do the upstairs then charge the battery again and while the battery is charging I wet jet upstairs and dust with my swiffer duster. Once I am done with upstairs the battery is charged enough to do downstairs. So it's all good for me.