Updating Guy's to remove TM