change some login in problem 14