implemented new version of RFC002