WIP: Fix to use a function
5 files changed