Thanks so much for the advice! I've just implemented that logic.
Nice! It feels a lot better now imo!!