diff --git a/hardware/NVIDIA/optimus_notebook/automatic_configuration/auto_NVIDIA_config_v0.2.sh b/hardware/NVIDIA/optimus_notebook/automatic_configuration/NVIDIA_automatic_configuration_v1.0.sh
similarity index 60%
rename from hardware/NVIDIA/optimus_notebook/automatic_configuration/auto_NVIDIA_config_v0.2.sh
rename to hardware/NVIDIA/optimus_notebook/automatic_configuration/NVIDIA_automatic_configuration_v1.0.sh
index 9831492..1047410 100644
--- a/hardware/NVIDIA/optimus_notebook/automatic_configuration/auto_NVIDIA_config_v0.2.sh
+++ b/hardware/NVIDIA/optimus_notebook/automatic_configuration/NVIDIA_automatic_configuration_v1.0.sh
@@ -1,30 +1,55 @@
 #!/bin/bash
-
+#Does user run script with sudo?
 if [ "$EUID" -ne 0 ]
-  then echo "Prosím, spusť script se sudo"
+  then echo "Please, run script with sudo"
   exit 1
 fi
 
-#Installation NVIDIA drivers
-pacman -S --needed nvidia-dkms nvidia-settings nvidia-utils lib32-nvidia-utils vulkan-icd-loader lib32-vulkan-icd-loader libvdpau lib32-libvdpau libxnvctrl opencl-nvidia lib32-opencl-nvidia cuda lib32-libvdpau
+#Installation NVIDIA drivers + OpenCL + CUDA
+pacman -S --needed nvidia-dkms nvidia-settings nvidia-utils lib32-nvidia-utils vulkan-icd-loader lib32-vulkan-icd-loader libvdpau lib32-libvdpau libxnvctrl opencl-nvidia lib32-opencl-nvidia cuda
+
+#Check if "nvidia" module loaded
+CHECK_NVIDIA="$(grep -o -i "nvidia" /etc/mkinitcpio.conf | head -1)"
+#CHECK_NVIDIA_UVM="$(grep -o -i "nvidia_uvm" /etc/mkinitcpio.conf | head -1)"
+if [ "$CHECK_NVIDIA" != "nvidia" ];
+then
+    #All modules in the mkinitcpio.conf
+    MOD_EXIST="$(grep "MODULES=" /etc/mkinitcpio.conf | tail -n 1 | cut -d '"' -f2 | cut -d ')' -f1 | cut -d '(' -f2)"
+
+    #Does the mkinitcpio.conf contain modules? 
+    if [ "$MOD_EXIST" = "" ];
+    then
+        NONE_MODULES="$(grep "MODULES=" /etc/mkinitcpio.conf | tail -n 1 )"
+
+            #No modules, bot configs contain brackets, adding modules nvidia nvidia_uvm
+            if [ "$NONE_MODULES" = "MODULES=(" ];
+            then
+                sed -i "s/$NONE_MODULES/$NONE_MODULES nvidia nvidia_uvm/g" /etc/mkinitcpio.conf
+
+            #No modules, bot configs contain quotation marks, adding modules nvidia nvidia_uvm
+            else
+                sed -i 's/MODULES=""/MODULES="nvidia nvidia_uvm/g' /etc/mkinitcpio.conf
+            fi
+
+    #mkinitcpio.conf contains some modules, adding nvidia nvidia_uvm to existing modules
+    else
+        sed -i "s/$MOD_EXIST/$MOD_EXIST nvidia nvidia_uvm/g" /etc/mkinitcpio.conf
 
+    fi
+fi
 #Hardware accelerated video encoding with NVENC
 echo 'ACTION=="add", DEVPATH=="/bus/pci/drivers/nvidia", RUN+="/usr/bin/nvidia-modprobe -c0 -u"' > /etc/udev/rules.d/70-nvidia.rules
 
 #PCI-Express Runtime D3 (RTD3) Power Management
 echo '# Remove NVIDIA USB xHCI Host Controller devices, if present
 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1"
-
 # Remove NVIDIA USB Type-C UCSI devices, if present
 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{remove}="1"
-
 # Remove NVIDIA Audio devices, if present
 ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{remove}="1"
-
 # Enable runtime PM for NVIDIA VGA/3D controller devices on driver bind
 ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="auto"
 ACTION=="bind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="auto"
-
 # Disable runtime PM for NVIDIA VGA/3D controller devices on driver unbind
 ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030000", TEST=="power/control", ATTR{power/control}="on"
 ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on"' > /etc/udev/rules.d/80-nvidia-pm.rules
@@ -36,7 +61,7 @@ echo 'options nvidia "NVreg_DynamicPowerManagement=0x02"' > /etc/modprobe.d/nvid
 systemctl enable nvidia-persistenced
 systemctl start nvidia-persistenced
 
-#Rebuild initramfs
+#Rebuild initramfs (kernel image)
 mkinitcpio -P
 
 #Loading new rules