Addressed stuhood's comments