Refactoring final outcome contract
Merged