tv3 contribs to #164 #159 #160