updating math
math updated
merge disparate branches