Scripts update - part 2