More formula updates