Helper functions have moved