Refactoring 1
Script rewrites