refactored recomputations package