wip, benign for existing apps