Improve formulation