Finally got rematch working