Duy Update 004

Got rid of errors