some features added to visit... Again...