First changes towards Szpryngier stuff