rewrite + fixes