updated for cyclus -m