EOD commit, several major changes. Breaks the old trigger