removed use of generics