added findescape
merging