hunter SV update + BM small code change