added typing thing
merged