switch to new, simplified API