Replaced %~ (+1) with +~ 1, same with -~