Modify computations. Fix circular imports