better rewrite for first edition