Took community comments into account