general changes with MP and pyHCP