Vu Nguyen Add some new codes