updated namespaceing stuff