some changes for visibility