First version of new rewrite