better backwards-compatibility support