Updated giftbox clustering