Adjusted to latest version