updated esc/save strategy"