finished phase 2

Still need to do: auto

Signed-off-by: HUY PHAM <huypham612@gmail.com>