more underscore changes