Made changes to assembling part