Adding the remaining parts