modified scripts a bit