slight modifications to avoid polluting the namespace
format changes