Adjusted to new signature.