Added saving and shift to draw straight lines