Yep, this is how it worked for me as well for my initial grant. However, my understanding is that yearly refreshers are often done as a set number of units.