refactored (jenkek)