RC. Fixed HCS and SA to include expanded nodes.