dispatcer update

integration tests not valid yet!