Addressed JB's comments