Made some modification for TMan