Sarah's code

Signed-off-by: Calvin Leung Huang <cleung2010@gmail.com>