Apply that strategy to the two other functions
3 files changed