more changes in types
remaining types added