some changes in API