added two parts