Fixed the script and some parameters