refactored into more scriptfiles