Rematch functionality added