Update Visibility too!