I'm with you on the gluten free substitutes! I'm not happy either and some products have just gone altogether with no substitutes