Rewrite + documentation