Make  more compatible with