fixup! Moved common functions to the utils