(sync with hyperion)