Lot of modifications in different parts