BUG BEGONE part 2