adjusted to changes