some extra types
Fixed merge conflicts