Half Completed full mod and half Mod

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