Rewrite, args update, bump version