address comments, even the Boolean one