Re-added dashes, removed NL