couple of modifications to the B version