This is Fang's file for merge in class project