updated for current apis