random fix and collection update