Work on T back-calculation, refactoring needed