Add some edits at JWang's request