Will update that.

Exactly (for the second point), do you have a better suggestion?