update to have new API