Added escape-functionality back, whoops.