Added filtering by opponent