applying changes from commit 208d573 to GetLLM_dev