Cook 1773

resync'd to current base