cleaned up computations1 more