improved usage of new API
better language