Legacy script needs to be fixed