small changes for euphoria support