Script was refactored