Vu Nguyen add some codes