updated to handle namespaces so we don't get double namespaced