Trying a refactor to see if it helps