Added more escape functions