Adapted script to previous commit