slight changes in Main, before adding the old local to methods.