Changed script regarding last refactoring