updated to Patrick's 11/26/92 version