Updated main scripts