version 2 

Change-Id: Idad5e97a0e5f644a4e90291d883b13b5da496cd6
Signed-off-by: taoman89 <juntao.zhu.2010@sis.smu.edu.sg>