scripts update
update paths
update paths
Refactoring + Messaging