This support method requires unit tests before it can be merged