updated scripts a little because CDO