Revert "Change function args"

This reverts commit 04e15831e3898acce0e4ed94fd386c8390580a41.