re-enabling redundant computations. issue #4 need to be fixed later