Scrpt more automized, states all match now