Re-add the standalone