Tix 795: set up visiblity code
Tix: 795 - better visibility code
Tix: 795 - even better visibility code