some fix
change some methods