Update 6: Minor changes