adding refactored scripts