Revert "Revert "Match Result and other changes""

This reverts commit 53ba5e7af0be4c7bd3a5042909404759e68504ca.