Made the scripts more portable