Massive changes prior to deployment