Sources adjusted to 4.2.2