Make it eos compatible