updated all the math