tzhang - modified some files to repair