Refector matchController code