Altered things to support passing a name through