Escape mode added