Reduce server wait times for BV