adjusted to new fixtures organization