You got it right.
Oh, and I don’t have to bring my phone to one of these “geniuses” to change my battery since the S5 allows the user to do this themselves. The S6 they dumbed it down to follow Apple for some reason and it’s gone downhill since then. The S5 was their last best phone and they will have to pry my dead hands from it!