Changes to the scripts and linking process