That is correct, exactly as you describe. My manual says 16ah.
I will try and post a few pics. The bike has had some modification done during past ownership. I don’t know anything about these bikes so would appreciate comments once I figure out how to post pics.
Cheers
KC