all added to github. rewrite is working