changed  structure