Changes from May live test