added refactored scripts