Make program somewhat more parametrizable