more progress on visiblity integration