lots of changes for visitor side