Trying to fix our scripts