added non-cluster run option