refactoring
update scripts