Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code