Modified script to be not interactive