Add -w param for run without current state