fitting to new structure set by Soheil