Adding BV code + test