updated with cyclus core