improved usage of new API