Updated to R12, had to discontinue submodule use unfortunately