modified some files and encod