trying to stop using escape
oops forgot some files from teh last commit