tested script and added a few things