6th change debug some errors