Updating run script to be more flexible