Started to harden the script