Tweak to Susanne's requirements