diff --git a/moderncvbodyvskillmatrix.sty b/moderncvbodyvskillmatrix.sty
index c4605c3..9914ce0 100644
--- a/moderncvbodyvskillmatrix.sty
+++ b/moderncvbodyvskillmatrix.sty
@@ -48,6 +48,7 @@
 \RequirePackage{multirow}
 % \RequirePackage{ifmtarg}
 \NewDocumentCommand\legendFontSize{}{\scriptsize}
+\DeclareDocumentCommand\starIndependentTabular{}{}%
 \NewDocumentCommand\cvSkillMatrixLegend{s +O{.25em} +O{basic knowledge} +O{intermediate knowledge with experience in projects} +O{extensive experience in projects} +O{deep expert knowledge} +O{expert/guru} +m}{%
     % check whether Argument #8 is given and if so provide it as cvitem
     \def\legendString{#8}%
@@ -57,7 +58,7 @@
     \if@aftersection\else%
     \vspace*{-\separatorrulewidth}\fi% HACK; I don't understand where the space is coming from, nor what it's exact value is :(
     \noindent%
-    \NewDocumentCommand\starIndependentTabular{}{%
+    \RenewDocumentCommand{\starIndependentTabular}{}{%
         \begin{tabular}[t]{@{}p{\hintscolumnwidth}%\skilllegendhintscolumnwidth
                         @{\hspace{\separatorcolumnwidth}}|@{\hspace{\separatorcolumnwidth}}
                         p{\cvskillwidth}@{} 
@@ -73,10 +74,10 @@
     }%
     % because of this weird style and the position of the parameter [#2], the dashed lines of the other version look bad. So no lines. 
     \IfBooleanTF#1%
-        {% if a star is given, do the same as if no star is given
+        {%
             \starIndependentTabular%
         }
-        {% if no star is given, do not add dashed line
+        {% 
             \starIndependentTabular%
         }
   }%
diff --git a/template.tex b/template.tex
index 52452b4..3e548a1 100644
--- a/template.tex
+++ b/template.tex
@@ -111,7 +111,7 @@ Detailed achievements:%
 
 \section{Computer skills}
 % % Add a legend if you are usng \cvSkill{<1-5>} commant
-\cvSkillMatrixLegend*[1em]{Legend:} %Optional add a Legend descriptor or a star for dashed lines. 
+\cvSkillMatrixLegend*[1em]{Legend} %Optional add a Legend descriptor or a star for dashed lines. 
 % \cvSkillMatrixLegend*{Legend}
 \cvdoubleitem{Languages}{\cvSkill{1}, Bash, 2 years}{category 4}{XXX, YYY, ZZZ}
 \cvdoubleitem{category 2}{XXX, YYY, ZZZ}{category 5}{XXX, YYY, ZZZ}
@@ -128,17 +128,17 @@ Detailed achievements:%
 \cvSkillMatrixEntry*{}{3}{\LaTeX}{14}{Clearly I rock at \LaTeX}
 % OS
 % notice the use of the starred command and the optional 
-\cvSkillMatrixEntry*[1.5em]{OS:}{3}{Linux}{2}{Best OS in the world}
+\cvSkillMatrixEntry*[1.5em]{OS:}{3}{Linux}{2}{I only use Archlinux}
 % 
 \cvitem{Skillmatrix in another language}{German example and dropping some dashed lines (exept fancy style)}
 % %% German version
 % % adjust the legend entries for other languages like so. The first entry is a post padding
-\cvSkillMatrixLegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Er\-fahr\-ung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{}
+\cvSkillMatrixLegend*[0.2em][Grundkenntnisse][Grundkenntnisse und eigene Erfahrung in Projekten][Umfangreiche Erfahrung in Projekten][Vertiefte Expertenkenntnisse][Experte/Guru]{Legend}
 % % Similarly adjust the head of the matrix for descriptiors in other languages
 \cvSkillMatrixHead[-0.0em][Level][Fähigkeit][Jahre][Bemerkung]
 % 
 % % The matrix itself
-\cvSkillMatrixEntry{OS:}{3}{Linux}{2}{Best OS in the world}
+\cvSkillMatrixEntry{OS:}{3}{Linux}{2}{Blub blub}
 
 \section{Interests}
 \cvitem{hobby 1}{Description}