modify as tantan instructed