Major update, added scripts