some changes for current api state