Fixes v2 of the refactor