BVAL-354 Incorporating review remarks