Trigger Improvements

Debug commit