Added not-option flag; restructed date updating