Initial changes for hyperion