Major updates per Cliff's request