adding support for easier visiting