Made this version agnostic.