Matchmaker result extension updated - better code