Better handling of diffenrent OAR versions. NT.