[master] better api