Reenstated the goto command logic in main module