+ Updates to new scripting system