use teddy shots & fix subscription error