some ctructures changes