v2-compability added