refactor so we don't create a breaking change