Added wrappers for both weight functions

Functionality not tested