Made some changes needed for escape sequences