added compatibilty checks