Alterations suggested by Matt