update to escape normally, and add raw extension, -> extension