improved cci wrapper script