Vu Nguyen Add some codes