state update
Tests added
Undoable
Merge remote-tracking branch 'origin/master'