Refactor ATN calculation to use existing code
Refactoring
Fix merge conflict
Try to fix ATC