added escape stuff