changed standards accroding to API change