Merge Ward's updates