Renamed script and improved it