added better ctrl-z