Adding BV code + test
Adding BV code + test