Changed some script and removed placeholder