Changed script ordering