This function is part of develop-olympus, so should have compatibility function here instead?