Updating vivian's branch