building in the equation, almost done