moved calcs to their on ns