escape functions updated