Re: [dev-context] Some math improvements