* changed to package
* calls not properly support `nil`