modify some statements as prof g pointed out