Added rematch feature logic
Merge commit 'd8d135e5f3eb8a05d48d7172f33c8c55da3a4a17'