"current" script refactoring