RFC 4

Same commits, fixed.

There is no RFC 3.