some formulation changes here and there