Start using the previously implemented in all forms where we can/should