add refactored scripts