modify so this works (a bit) with sandboxes