better API
better API
test fixed