Refactoring Tas/Talon