added thham and retune