Adding Generics2 solutions