Rewrite, updated command-line