Cleaned up the compatibility check method