Update the script & remove debug aspect