Addressed Logan's comments