changes in shop #generics_1