5.1 backwards compatability

Should be fairly straightforward