In Progress

private for hvtuanan - Fix 2 members issues