some ctructures changes-2