stable api - jherez code removing the namespace
attempted to merge conflict