replaced static commandline options with generic variables