dealt with errors in merging the forked version. like the domain
parameter in the visitors