replaced old version with rewrite