making it compatible with eos/uscms