version 6, adding compatibility up to 24.0