update to rc suggestion