Moving to official formula structure