update method signature for #20 and #22