Change ID used
Additional ID variable corrections