rewrite, scrap that old stuff..