ACF 5 compatiblity

(maybe you'll have to check for bugs)