:confetti_ball: Improved