modify by yuri for spy