Main changes before deploy