Trinity refactored