annotated by area major fixes