More Candy's changes