some changes in all methods