Improved GenVisitors script