Better api (12/14)

Better api