TOP processing improvements