Added live mode functionality