1st batch of bugs