Added live mode