Updated with script fixes.