Enhanced the match controller. Final Commit