phuong dong fully integrated & refactoring/repackaging done