Updated with live features