faster save and avoiding esc