Updated with Live Changes