Slight modifications to TME