Changes suggested by Cadams