small improvements
new API