Final Changes for launch