Consistent alignment and RC update