New DRY update (very spoiler-y, do not click if you don't wanna get spoiled for Day 3)