Vu Nguyen add some new codes