improve demo mode as