jukebox refactored