changes in shop #generics_2