Added some new modifications to the scripts