Trying to squash bugs