FIX for shuffling and removing points