Tweak the RFC RFC based on feedback