more changes to accommodate RC