version with fixed namespaces, finally