partial 2
merged partial 2