Added other parts