Fixes v3 of the refactor