Adjusted to latest changes.