Addressed Wan-Teh's comments