reworked 2.4.3 to 3.3.5