initial adaptation for 3.6.3