adjusted to 7.0.0-Final