Vm 3

@wluyima 
Hi Wyclif, pls review and add these changes into main repo.
Thanks,
Ishara