Modified scripts a bit