Agree, again.

Tbh, it will be a bit of work and they might need to give more time at HT but just "make it so!".