Simplify.
Use the new signature.