some changes in handle methods