revised by Ed 2