added types
merged