Used the function of worth

Fixes #1 #2