Upgraded to match init.py and menu.py used in upcoming release of finPipeline