Renamed  to  and added  for full board analysis