merged in latest version of script + version