renaming + script improvement