Almost done with compatiablity check