Updating changes from production site that were done in the last weeks before the camp.