Updates to include trigger and have a proper run script with full corrections.