added compatibility switch