Changes from second dry run