First tries to make changes according to 4.1