Improved torch handler

With more efficiency!