csnguyen-yahoo-branch modify