Trying some changes to item generation