#164 change some methods