Updated stitch-up version