Added options and short -step