This should now be compliant with the RFC002