adding standalone mode