Update 30/10
Minor changes