Option 1) is the way, the undo/redo stack works at the moment, when you have multiple data layers. I like this, as it is the simplest and most conventional. Option 2) isn't too bad either. Paul