#9 change some methods