added in typeing support
merging changes of typing