switch to simplified API