added run-time options