Back to the old computation ... for testing! Possible broken