updated wscript
merged with remote