6-Jul edits from Bumblebee