TM simplification, take 2