fixup Main to work with refactored semantics (testcase failing!)