Initial Tweaking of script
build