updated for newer versions of Noir an Hiccup