Addressed last comments by WB.