sync to main; some visiblity thing