Update 30/10 21:15
Minor changes