final improvement of first rewrite