Improved RFC-002