Addressed @mgermain's comments