changed state to include borer, and made grid rectangular