refactoring of the script libraries - continue