Revert "Joe has undone some of the changes in order to make another program to run"

This reverts commit 2895d4741850cc0ed72329211faaa531dcffb250.