RFC 3

Same commits, fixed.