Update bv04, 05 by Mawin