Changes per Thomas for final launch.