Add RCS Id, update logic a little.