fix method signature
add some more helpers