Updated RFC as per comments