updated underscore and hyphens