Changes on scripts