Added jigsaw option