Add visibility and justgage