update for new namespaces
formatting tweaks