Added feature for live inputs