Files adjusted to 4.2.x & much more